merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 25 Nov 2010 11:35:05 +0000 (20:35 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 25 Nov 2010 11:35:05 +0000 (20:35 +0900)

Trivial merge